rendernode: Remove the renderer from the rendernode

diff --git a/gsk/gskrenderer.c b/gsk/gskrenderer.c
index 21236cfc13f01211a3df4f796f1db606d09e87a7..3bdab325ebc80542cbcdcd94e17766c9564335fb 100644 (file)
--- a/gsk/gskrenderer.c
+++ b/gsk/gskrenderer.c
@@ -623,7 +623,6 @@ gsk_renderer_render (GskRenderer       *renderer,
   g_return_if_fail (context == NULL || GDK_IS_DRAWING_CONTEXT (context));
   g_return_if_fail (priv->drawing_context == NULL);
   g_return_if_fail (priv->root_node == NULL);
-  g_return_if_fail (root->renderer == renderer);
 
   if (context != NULL)
     priv->drawing_context = g_object_ref (context);
@@ -683,7 +682,7 @@ gsk_renderer_create_render_node (GskRenderer *renderer)
 {
   g_return_val_if_fail (GSK_IS_RENDERER (renderer), NULL);
 
-  return gsk_render_node_new (renderer);
+  return gsk_render_node_new ();
 }
 
 /*< private >

diff --git a/gsk/gskrendernode.c b/gsk/gskrendernode.c
index c1494cb79a441bf777190f94ccbd6b080ba65776..2b56b104eba4ef18b6a9313c9fbf75470f122b79 100644 (file)
--- a/gsk/gskrendernode.c
+++ b/gsk/gskrendernode.c
@@ -247,17 +247,13 @@ gsk_render_node_get_type (void)
  * gsk_render_node_new:
  * @renderer: a #GskRenderer
  *
- * Creates a new #GskRenderNode, to be used with a #GskRenderer.
- *
  * Returns: (transfer full): the newly created #GskRenderNode
  */
 GskRenderNode *
-gsk_render_node_new (GskRenderer *renderer)
+gsk_render_node_new (void)
 {
   GskRenderNode *res = (GskRenderNode *) g_type_create_instance (GSK_TYPE_RENDER_NODE);
 
-  res->renderer = renderer;
-
   return res;
 }
 

diff --git a/gsk/gskrendernodeprivate.h b/gsk/gskrendernodeprivate.h
index 2a395bfe6f983a36ae0cd10d8bc9771d87f47f11..20e6084d0c062cf509125d5c837c9f02ac398246 100644 (file)
--- a/gsk/gskrendernodeprivate.h
+++ b/gsk/gskrendernodeprivate.h
@@ -2,7 +2,6 @@
 #define __GSK_RENDER_NODE_PRIVATE_H__
 
 #include "gskrendernode.h"
-#include "gskrenderer.h"
 #include <cairo.h>
 
 G_BEGIN_DECLS
@@ -17,9 +16,6 @@ struct _GskRenderNode
 
   volatile int ref_count;
 
-  /* Back pointer to the renderer that created the node */
-  GskRenderer *renderer;
-
   /* The graph */
   GskRenderNode *parent;
   GskRenderNode *first_child;
@@ -77,7 +73,7 @@ struct _GskRenderNodeClass
   void (* finalize) (GskRenderNode *node);
 };
 
-GskRenderNode *gsk_render_node_new (GskRenderer *renderer);
+GskRenderNode *gsk_render_node_new (void);
 
 void gsk_render_node_make_immutable (GskRenderNode *node);